Merge tag 'upstream/2.3.0'
authorOlivier Sallou <olivier.sallou@debian.org>
Wed, 13 Apr 2016 05:54:14 +0000 (07:54 +0200)
committerOlivier Sallou <olivier.sallou@debian.org>
Wed, 13 Apr 2016 05:54:14 +0000 (07:54 +0200)
Upstream version 2.3.0


Trivial merge